*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index efad56aa0fcc8563ea3f089fa56cde77aa1e4885..8c2145e894db4645023385cd3e552c4911c70eb1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-21  Alan Mackenzie  <acm@muc.de>
+
+       * progmodes/cc-engine.el (c-guess-basic-syntax CASE 5D.5): Fix an
+       infinite loop on invalid syntax.
+
 2008-06-11  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-make-temp-file): Backport from Tramp 2.1.